MOB-1695

Mobile Team, please review :)