Feature/en 1853

What does this do? Can you expand on the comment to explain why it is needed?