Repair offer/answer model (bug #2293), initial CNG work for new frametype