MOBILE-196 Initial comments