Merge branch 'cr/reset'