up to 0.6.0, new upstream