added waypoint prefix to developer config
Merge branch 'master' into next