Testing|hack, issue #1009: Update make hack environment Upstream-commit: b44e2e71aa80246d5ef0f18e95f873c53d13edf5 Component: engine