Merge branch 'dsa-changes-for-multiple-cpu-ports-part-4'