Let's wait for a confirmation first. Again it's holiday season, so this might take a while :) (or you if you prefer to wrap this up asap, you can also change this back for now, so I can merge your other changes first and we can open a new PR for this)