Merge branch 'rename-control' into develop