merge from b2g