Conflicts: utils.go utils_test.go Upstream-commit: 7cf60da38880534d76d031c4646fbd469d922385 Component: engine