third commit CLIEN-9