Merge last recent changes to 1.10.x into feature-zm

I saw that there are some changes to 1.10.x that should make it into feature-zm, but yet didn’t.