[SR-Dev] git:sip-router: Merge commit 'origin/daniel/pv' into fixups