Merge from branch Vista-detallada-Local
Merge from branch Vista-detallada-Local 2