Fix for MOBILE-1409