Merge branch 'upstreamedge' into feature/add-xy-maxspeed