DE897

Backported 2 commits to solve DE897. Had to delete the tests in the second commit as they wouldn't pass in Havana.