Fix regular init prop
Merge branch 'feature-mzn' into develop