stripped out feature toggles
merge master
rerun precompile