Merged apps and extensions object models from trunk