precompile
merge + fix merge conflicts (timo) + precompile