Merge pull request #8032 from sbomer/dasm_automation