FALCON-304 Simplify assembly for script in standalone and distributed mode. Contributed by Suresh Srinivas