[sr-dev] git:master: Merge commit 'origin/rbetancor/drouting'