reapply Cmd value even if CmdAdd returns early Upstream-commit: 4b587ac118284fbbc9b10c20319b2dd8c20d4b4f Component: engine