Merge branch 'master' into new-dependency-and-nest-constraint-semantics-development