Add changes from adapt_framework/feature/navigation