RELEASE-NOTES: Synced with 07ac29a058