570: Merge 4f2cd05aeeaff169a57ecc53505406e83fc7d0a5 into f7275819ac4c533939af11072beba0a3ebec1e7e