cherry-pick-merge usync_to_lsl (git merge  koshi/usync_to_lsl --squash) with some reverts