Merge #10537: Few Minor per-utxo assert-semantics re-adds and tweak