Merge branch 'nd/reset-intent-to-add'