Merge patch from branch Ditchou-feature/add_component_cron_editable