quick fix
Merge branch 'refs/heads/dev/jose.toti/diff_layouts' into feature/newLayout