[[ MERG-6.7 ]] Mobile update refactored