I have the same problem on the latest release 4.19.4. Anyone know the fix commit (to pick it from the upcoming 4.20)? It seems that there is no fix in 4.19.5-rc1