Merge branch 'shmobile' into devel