Add changes for feature-b2g