mejora del wizard
c
Merge remote-tracking branch 'origin/6.0' into 6.0