Fixed in `master` and the fix has been applied to the `2.1` branch as well.