rebuild to synchronize with additions to 0.9.7 branch