Add related tasks in a US #723