Upgrade to OpenXava-4.7.1, replace the code (and need merge later)