Merge branch 't/shmmax'