Merge pull request #799 from sjcorbett/as7-security-0.5-backport

AS7 security 0.5 backport