[CORE-8140] 2.4.y.z/cached-team-persistence-trunk#2611

trtshen merged 3 commits intotrunkintersective/app:trunkfrom

2.4.y.z/CORE-8140/cached-team-persistence-trunkintersective/app:2.4.y.z/CORE-8140/cached-team-persistence-trunkCopy head branch name to clipboard