(chore) merge master into 3.10 and fix all the MRs