RELEASE-NOTES: synced with 854aca5420f