AUS-2559: Turn visibility on and off
Merge remote-tracking branch 'upstream/master'