Add support for named build stages Upstream-commit: 2e96c1739be45f2ff8342cb3e222db3eb1616839 Component: engine