DDF-152: merge into 2.2.X branch