ISPN-2809 Include sample clients which were previously part of library