merged with latest security-check