Merge branch 'for-0.24' into tc-fixes