Fix #305
Fix #308
Fix #307
Remove ending line
Merge branch '2.9.x'
Version 2.9.13