fix a bug in link remove
Merge branch 'master' into develop