RELEASE-NOTES: Synced with 5a47062cada9