> This has been fixed in the 2.2 version.

I'm not sure if I backported the fix to 2.1.x branch. Currently I'm on
vacations and do not have good internet connection to check it myself.
You have to do this yourself or to wait until 20th of April

Roman