Merge "un-deprecate withArgCaptor" into main