GCP-6232 bug fixes
Merge branch 'master' of https://github.com/digitalabs/IBPWorkbench