Update c-support v6.1