Display none only if protection is enabled
Merge branch 'MAINT_4_0_5' into QA_4_0