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

This reverts commit 2121325111bed2770008c597fe7a15aee47edf08.
Rebase from 'upstream'
Trimmed the branch to only the stdr_gui sub directory