Update corresponding to CSA14 code of 04/09

Main changes as discussed in the private mail exchange and google doc, should compile and work out of the box.