OGGraiN-1788

OGGraiN-1788