Fixed bug in smf.
Merge branch 'test' into dev