@tolbon thanks for this PR, very much appreciated. Could you issue that PR against 4.x-dev as we only merge regressions into 3.x-dev?
4.x-dev
3.x-dev