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

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