Merge branch 'conflict-in-update-preferences' into 'devel_15.0.x'

Conflict in update preferences

See merge request !1228
32 jobs for devel_15.0.x in 14 minutes and 41 seconds (queued for 8 seconds)