Merge branch 'fix/ogp-missing-data' into 'develop'