Merge "fix an issue where invalidate/transactions could be missed"