CLDIDE-2009 Added functionality

@vparfonov