AVF1308 - Update to initial commit