Thanks for the patch #6.
Have committed this to 8.x-2.x branch, Which will fe...