DG: Fixed Sharing Agreement issues (REF-387)