Recreate links

Change-Id: I3aee2386653543d5a14d1fdc60d0806548616a29
Update controller task set

Change-Id: I08514e44aca731fa1ee7133d7d324314eec1bcb2