Exhaustive revision to try to erradicate the bug of XBEU infiltrating among the countries without block analysis.
Conflict resolution after merging with dev.
Fix conflicts