Waypoints and formations required (cherry picked from commit 651aa72dfdf6164d2f512d3d330ca8023c4d5eed)