Merge branch 'dsa-refactoring-set-1'