For merge/master

merge jindw:master to tensor-dev:for-merge/master