Fix for MOBILE-1575