Merge "TaskId=0 is also a valid task id, should not be passed to valueIfKeyNotFound." into main