APIGW-636 Fixed auth-res-509 support