Merge master into 0.6.5-dm-plugin Upstream-commit: 0d603df6dcee18aac797111eef633c61849c41dd Component: engine