Merge with 1.0.11e (utxo) version.