Merge commit 'origin/master' into ht_sandbox