Merge "fixed WAN port deactivate issue" into dublin