Conflict in update preferences

Merged Piotr Gawron requested to merge conflict-in-update-preferences into devel_15.0.x

Closes ##1326 (closed)

Merge request reports