Change router target
Merge commit 'de2cadd' into develop