backport upstream version updates to 0.2