Sync with agent code at ofelia.development
Refactoring settings