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

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