Merge branch 'develop' into lbudginas/#675_scroll_to_target_proposal