when my PR ( #4962 ) merged ( hopefully :D ), you just can make rebase agains master :D