Merge "Switch to modern ArgumentMatchers"