Add solution for #11172; modified .gitignore