Merge from noflo components