checkin for v0.6.9 forward roll