Merge branch 'cc/reset-keep'