Merge "New assets" into honeycomb