GCP-6469, GCP-6470, GCP-6471
Merge branch 'master' of https://github.com/digitalabs/IBPMiddleware

# By tippsgo
# Via tippsgo
* 'master' of https://github.com/digitalabs/IBPMiddleware:
  GCP-6458
  GCP-6458