Merge branch 'cn/bom-in-gitignore' into maint