RELEASE-NOTES: synced with acf59be7f09a7