task #00020-Modules_update Minor fix
Merge branch '00020-Modules_update' into develop