Merged Cil changes