Merge "Refactor Workspace Loading / Processing code." into tm-qpr-dev