MOBILE-2995, MOBILE-3025 & MOBILE-2984