WmfTransaction bugfixes

Change-Id: If454813ffc397135bcc770e33290fc7193ba283e
Merge "WmfTransaction bugfixes"