DDF-763 Removed changes from master