Merged from dev-home, finalized tabs
Merge branch 'dev' into dev-home