Start to merge in navigation changes from master