Fix for MOBILE-1555