Several fixes in formatting Upstream-commit: d136f5e027e30ac1f92938c7e5ea72b00f49dfc0 Component: engine