Manual merge of semi-updated control code

UCC git Repository :: git.ucc.asn.au