Merge "Controls - Setup" into sc-dev