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

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