Merge from declarative-syntax