Merge branch 'routing-stats' into 'devel'