Btw, the commit for the "one small adjustment" I made is 6fb5a899bdc81f720ec01fe506bfc25c4d8759d1. Maybe you want to try with that integrated as well just to make sure...