Added support for conditional decoration of routes
Merge remote-tracking branch 'upstream/v2.0'