changed dependencies for STABLE-3.1 branch