Merge "Fix issue with TransactionProxy throttling test failures"