Rebase signal master to current GIT
Fix string ID conflict