Story 44499479: making sure that control_codes link on update