Bz1020859: Updated with some fixes for standalone mode, modified and added scripts