MOBILE-2979 & MOBILE-2992