Merge "Extract TaskContainer to its own class" into main