Merge "Latest assets from designer git"