Merge branch 'dsa-port-config'