Merge with tec499-20142/warmup