Minor - some merges from 1.9.x