MOBILE-2995 & MOBILE-3025