[4.2] Router DocBlock Fixes