Relax some dependencies
Merge branch 'stable' into sergey/base64