Fix mergeConfig with new ports Upstream-commit: 3f2a5912eecfd54713e3b54bbf79be6702f13f25 Component: engine