Merge branch 'backport/develop-branch-hiding-fix' into 'develop'