Optimize links tracking and repairing
Merge branch 'development' into dev/j2/common