GCP-5815
Merge HEAD, branch 'master' of https://github.com/digitalabs/IBPMiddleware