Rev main branch version up to 0.7