Definitely. Actually it will be done when I will rebase my patch on master which contains this patch #9