MODE-2092 Added back 3.6.0.Final compatible dependencies.