Fix for GCP-6240
Merge branch 'master' of https://github.com/digitalabs/IBPWorkbench