Updated from 1.8.7.11 to 1.8.9.
Merge branch 'release/1.8.9'