Reservation removed see #7123
Refactoring configuration loader see #7124