Merge branch 'nav-to-profile' into development