Merge "Update modeling/modelspec to latest commit"