Merge branch 'rs/check-ignore-multi'