Merge branch 'fix/ogp-title' into 'develop'