upgrade path for multiple client support from 7.x-1.0-alpha1