Getting horizon config inline with upstream