Merge branch 'release/12.5.2' into develop
og:image bug
Merge branch 'release/12.5.3'