Merge branch 'm25_MDL-38790_Missing_setType_in_My_private_files_form' of https:/...