Updates the api_version 6.8
Merge branch 'upgrade_api_to_6_8'