Merge branch 'lt/reset-merge'