Add 5.8.x in order to debug gh#275