Merge "Bug 7295 - Incorrect handling of device transactions in clustered setting"