Merge origin/master into feature/navigation.