Completed Merge from 'Create-Client'