CLDIDE-1927

@andrew00x