task #00015-field_muo: Minor fix
Merge branch '00015-field_muo' into develop