Guard against system with waypoints already loaded
Merge branch 'master' into thread_test