Bugfix/3410 close srp vulnerablility