I believe this has now been fixed with the following commits. This will be available in the next major release.