Another comment that can be removed maybe?
Same for the other context.xml. Maybe you could check if both files are really needed?