Fix #283
I have changed my username
Merge branch 'pr/286' into 2.9.x
Merge branch 'pr/285' into 2.9.x
Version 2.9.9
Merge branch '2.9.x'