Merge branch 'enable-ogp-by-default' into 'develop'