GCP-5711 Synonym fix
Merge branch 'master' of https://github.com/digitalabs/IBPMiddleware

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