RELEASE-NOTES: Synced with c7a76bb056f31e