Update to new upstream release (v0.8.6), fix dependencies selection