GCP-7239 + GCP-7240 bug fixes
Merge branch 'master' of https://github.com/digitalabs/IBPWorkbench
Fixes for GCP-7239 for cases when there's no initial project yet