CAS-1415: Updated to v39