MOBILE-437 WIP