Thx for this.
Just a little question, must this fixes be back-ported to 1.8 release branch?