task #00027-Switchs_module: Minor fix
Merge branch '00027-Switchs_module' into develop