Merge "Change default vports type to int"