apply new (untested) bsp from Cui Gao

after replacing product name with project codename.
go for release and fix 2 remaining issues