CF-345: fix schema to be in sync with OrderLy