Pull to main plugin branch.

TODO: fix possible NPEs in UserIdCauseDeterminant.java