Issue #21615:correctly update characteristics on supply order