trunk builds use branch 22 for now