Merging latest L4 changes
Some route fixes