IGNORE Reflecting changes on core #718

Closed thiagobustamante closed 8 years ago