fixes #6125 / BZ 1106914 - organization ui - remove cloning