OSG-11897

OSG-11897