Merge "Fixed routing change bug"