Merge "add aggregation policy for NSI selection"