Restricting visibility to workstation implementation to package.
Manual merging of master branch