Be more aggressive about using shared cache resources.
Merge branch 'develop' into data-source
whitespace and spelling complaints.
Merge branch 'develop' into data-source