Feature #5369168815992 y #5369168815999

Diego
Merge branch 'dev'