[#6444] Finalized script