Feature/en 1853

Should something go here? If not, remove the comment, or add a comment explaining why we have an empty module.