update to r1217