[4.2] Router DocBlock Fixes
Merge branch '4.2'