Merge "Revert the change of unifying visibility" into main