Merge branch 'lane/per-model-think-default'