Merge "Ignore failing test of EntityHeaderControllerTest" into main