merge r13419 (route6 without gateway) to 8.09