Fix for MOBILE-2475