Hotfix changes for default values in 0.6.5 Upstream-commit: d7fac67e0a2c7fe2138e2d5dea99bd169bde3ce9 Component: engine