Closing patch #101120 -- After everyone agreed.
3 files changed