Propagate the changes from the 2.0 and 2.1 CFBam model to 2.2.