Merge "Submit fixed script." into jb-dev