Port to motion-support 0.2