Merge branch 'develop' into lbudginas/#575_post_view_comments_section_updates