GCP-6295 re-applied join annotations after fixing at apps level
Merge branch 'master' of https://github.com/digitalabs/IBPMiddleware