Moving to draft-ietf-core-comi-17 ...