1.9.17: Some more misc push. May be end of this version.