Merge remote-tracking branch 'origin/master' into beta
[Emulink] code cleanup
Merge remote-tracking branch 'origin/beta'