refactoring: move waypoint parsing code in Waypoint
fix #3594: personal note parsing is too loose
Merge branch 'release' into upstream