Merge branch 'develop' into lbudginas/#555_blocks_page_filter_expand_bug