Merge branch `Sean` further