Merge "Updates to remove secruity violations"