Merge pull request #6446 from Faduf/YUPIF7_update