0.6.9 bugfreeze