RELEASE-NOTES: Synced with 6dd8bd8d2f9729