Merge "Merging multiple implementations of CancellableTask" into main