r17930: Merge noinclude branch: