Update code according to comments.
Update CA_BoC messages.