Merge branch 'dsa-port-enabling'