Merge branch 'tr/userdiff-c-returns-pointer'