Updates from Code Review

Merged Martin Lowe requested to merge github/fork/autumnfound/malowe/dev/stm-review into dev

Merge request reports