porting back from 3.5 from main PR #13334
Mechanical: % git mv clientv3 client/v3 % git mv client/mock client/v3/