Should be fixed now. I singled out the corresponding change into a dedicated PR to make ease reviewing for the team. It has already been merged!