Repo: Manual reset to origin/master to clean up repo for merge request to...

Repo: Manual reset to origin/master to clean up repo for merge request to upstream. Summary of changes: added input validation, fixed race conditions, major refactoring, improved readability and correctness, re-formatting of code.