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