Merge "Add route visibility support in platform"