Merge branch 'dsa-suspend'