Merge remote-tracking branch 'akrabat/hotfix/default-route'