Fix MOBILE-1216