DDF-304  removed TODO comment and set IS_VALIDATING property to false