Merge commit 'svn/origin' into ct