Merge "Asset swap" into honeycomb