Merge Brian's comments in conflicting files (by Inna)