578: Merge ede049a1cbc469bcbea2d4959ced6ec027d35493 into 274499087e9c6a0cf918aa60bc33115d99c054d0