#10591 start mobile optimisation