Merge "Update scripts to work on Nordix Master"