Fix for MPLY-4872. Buddy: Jonty D