[18.09 backport] builder-next: fix squash Upstream-commit: 8c0845a508e4e14659c82761aa7ec578d551004b Component: engine