Merge branch 'fix-avs-router-on-service-disable' into 'master'

#1960 Fix error on service without router.

See merge request !6873

(cherry picked from commit 50d975bc)

18aedfd9 Fix error on service without router.