second half of forward-port of recent a2/mb control protocol changes, this time enabl...