Fix some function and Add Label
Merge branch 'developer' of github-hrontan:hrontan/CoreWe3 into developer