DF-3938 fixed clone