Add support for RelayState
merge