revise Visible in .Internal implementation
Merge branch '21-misc-cleanup' into 22