parcial web-client
Merge Core