bug with arch check
Merge branch 'master' into sm