Merge branch 'sch_panic'