Merge "Clear transaction that's passed to mergeWithNextTransaction" into sc-dev