Merge branch 'dsa-Fix-a-bug-and-avoid-dangerous-usage-patterns'