Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'