sync from tvdzwan:master