Merge branch 'develop' into 043-Mobile_detection
task #043-Mobile_detection: MInor fix
Merge branch '043-Mobile_detection' into develop