Match MZN1.6 script instructions
Merge branch 'feature-mzn' into develop