Merge branch 'dsa-sw-bridging'