Merge "Asset import from ux-assets" into klp-dev