Fixing rare non-object error
Merge branch '2.9.x'
Version 2.9.10