task #043-Mobile_detecton: Minor fix
Merge branch '043-Mobile_detecton' into develop