Merge branch 'hotfix/ogp-cachex-fix' into 'develop'