Bug title
listo
Merge branch 'new_home' into dev