GCP-5700 (partial)
Merge branch 'master' of https://github.com/digitalabs/IBPMiddleware

# By chezka (2) and Christine Guiang (1)
# Via Christine Guiang
* 'master' of https://github.com/digitalabs/IBPMiddleware:
  GCP-5666
  GCP-5695
  GCP-5695