Pull trivial1 into release branch