Merge changes from visibility pull