Fix #278
Fix #280
Merge branch '2.9.x'
Version 2.9.11