Merge branch 'develop' into adubel/block-page-tests