T7671 / #7671 is now fixed