Initial commit for version 3-6GA