Merge branch 'topic/general_changes'