Merge pull request #12705 from pradpnayak/Visibility