Code cleanup
Merge branch 'smtb' into dev