Merge "Bug 2731: Discard changes only when transaction exist."