WIP: Resolve "Re-add auto_sm support"

Closed Marc Vef requested to merge 46-re-add-auto_sm-support into master

Closes #46 (closed)

Merge request reports