Merge remote-tracking branch 'origin/master' into florian.kistner/OC-9471