7.x to CLAW Migration Sprint - Complete!