Eng 5711 - Hotfix support