Story 44499479: making sure that control_codes link on update
Story 44699547: committing changes
Story 47049989: attempted js fix
Merge remote-tracking branch 'github/dev-brendan'