Cldide 2082

@vparfonov Can you allow me to merge those changes to master?