Merge "Move EventRelayerNull class to own file"