fix unitsync linking #2
fix unitsync linking #3
fix unitsync linking #4
Merge branch 'release' into develop