Merge "Simplify BaseTask and subclasses"