Merge "Bp/n/sFoo -> Bp/n/sHwFoo"