Merge branch 'jc/add-ignore-removal'