Fixed MOBILE-2476