Merge "Add property for multiple ev port locations"