Merge branch 'tb/precompose-autodetect-fix'