rebase fix

3 jobs for !49 with 35-add-edit-preferences-controller
merge request