COMP Fixed from geometry usage
Merge branch 'bug-18006-remove-contour-from-3d-interpol-integration'