DDF-107: merged fixes into 2.2.x branch