Thanks Tim Graham for review and Tai Lee for the additional test to prove this was a regression in 1.6. Backport of 7f2485b4d1 and 8137215973 from master
Thanks Tim Graham for review and Tai Lee for the additional test to prove this was a regression in 1.6. Backport of 7f2485b4d1 and 8137215973 from master