Also fixes U4-5592 and U4-5746 for 7.1.9