Use ListOpt for build labels Upstream-commit: 1b944a3025ba1eb1bfb86ed6393b7fe33de40eb6 Component: engine