SWF-2532 : Improve the script to reuse the existing clone