manual merge of ilmari speedup changes