Merge branch 'trunk' into compute-clean