[#565] Updated stand-alone scripts