Pull trivial2 into release branch