Refs #10154. Fixed geometry.
Merge remote-tracking branch 'origin/bugfix/10154_CNCS_geometry_fix'