Nothing new in 1.9, I didn't tough those part, we should have the same issue with 1.8, I'll do a separate PR