Merge remote-tracking branch 'origin/master' into directory-support

Author: cwong-scw