fix bug See merge request !393
Feature/cus service vulnerablity See merge request !392
fix bug See merge request !391
fix bug See merge request !390