Merge branch 'cc/reset-more'