case 3967 - Prevent displaying on admin pages.
Merge branch 'case-3967' into develop