The latest PR for this bug is reviewed and accepted by Kaze.
Its merged also.
Thanks Julien.