speed up successive compilations
Merge branch 'experimental'