Merge branch 'jc/add-2.0-ignore-removal'