Initial import of caf-3.4