Cherry-pick from task creation branch