Merge pull request #134 from dadbodgeoff/remediation/security-convention-s4