r1640 master trunk