[VERSION] v0.6.1 patch (unstable)