I recommend merging this branch while waiting for Tamosauskas comments on this. It's a problem which is on master anyway so no need to delay this pull request because of that.