add features for MOBILE-1318 & MOBILE-2097