Commit 450574bf authored by Manuel Jander's avatar Manuel Jander
Browse files

Fix merge errors. Reduce changes to MR3071

parent 45313db0