Merge branch 'develop' into lbudginas/#577_main_page_block_segment_bug