DS-1596 fix for Mirage Theme only.