GCP-8571 and GCP-8573
Merge branch 'master' of https://github.com/digitalabs/IBPMiddleware