Merge dev-generators-spec