sync with velocikit-core changes