Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev