Have patch, need bugnumber...
Patch is in -2 8c54092cb0a1d4043eae8e7ec46ea8fb6642554d in master and also in 4.7 and 4.8.