Merge "Fix blend name change." into klp-dev