Merge 1222 composer preview update