Re #9159 first cut for the USANS geometry
Merge branch 'feature/9159_usans_geometry' into develop