Revert "Trimmed the branch to only the sr_gui_change_controllers sub directory"

This reverts commit eeb28936e71fbc96e1083b7a2da38885c65e2f3a.
Rebase from 'upstream'
Trimmed the branch to only the sr_gui_change_controllers sub directory