Transfer changes from 1.10.x to feature-zm

Able to merge − hooray