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

# By Mae Isabelle Turiana (2) and others
# Via Mae Isabelle Turiana (2) and others
* 'master' of https://github.com/digitalabs/IBPMiddleware:
  GCP-7509
  GCP-5723
  GCP-5720
  GCP-5723
  GCP-5695