Merge "Added helper scripts"