Initial import of 4.2 files