Merge 4.1.7 hotfixes into master
Closed, ResolvedPublic