Merge Securityproxy master release