This need to be cascading. If that requires an hRaven update first, then lets get a PR for hRaven in the queue.