Merge branch 'dsa_swqitch_ops-const'