Move where visibility set, the holders are re-used, so this idea doesn't work
Merge remote-tracking branch 'upstream/develop' into develop