Merge branch 'ml/userdiff-rust'