Merge changes from MirakelX for task support