applying required fixes for DDC-2432