Pull in upstream commits through released version 0.8.0