Added commitTransaction and abortTransaction for proper cancel button behavior
Merge remote-tracking branch 'origin/master'