merged back NEW_ROUTE into trunk

No match.