* updates #15181 * actually we already did this in 03.15 together with the waypointmovement, but forgot to share it