Merge branch 'topic/beep-rename' into topic/core-change