Merged all changes into PeopleNet fork.