Merge branch 'tb/precompose-prefix-too'