MOBILE-2246 & MOBILE-2404