Bump API version, fix for changes
Fix merge