RELEASE-NOTES: Synced with 386ed2d590