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

This reverts commit 4f265a76e2589f4985b3c19afc13156b0011b27a.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the uwsim sub directory