Merge "Make final factors configurable." into tm-dev