Merge branch 'sm3' into devel