RELEASE-NOTES: Synced with 0ff0a994ada62a