merge in onyx changes