Missed a few github commits, v6.7