add feature for MOBILE-2065 & MOBILE-2136