Does OneDrive still have a 20,000 file limit?

I'm in the process of switching to OneDrive from Google Drive; mainly for Office 360 and better integration with Windows 10.Was reading online on some forum posts form last year and early this year with users of OneDrive complaining that you get 1TB of storage but there is a max file limit of 20,000 files.Does anyone know if this is still the case?I currently have 18,700 files to backup so it will work but i don't want to make the switch if this limitation is still in place as i'll run into problems in the future..