THANKS: synced with RELEASE-NOTES for 921a0c22a6f
RELEASE-NOTES: synced with 921a0c22a6f