CDITCK-305 Follow EE 6 visibility rules (despite vaguely
defined)