CDB-2620 Upgrade psych version
Merge CDB-2620 into release/2.12.0