RELEASE-NOTES: Synced with ad3836448efbb7