add v1.0.6 changes previously missed