pre-release fix bunch
Merge remote-tracking branch 'origin/1.1.9' into 1.1.9