RELEASE-NOTES: synced with b216427e73b5e9