Merge branch 'dm/disable-clone'