Is this branch work for you guys? I cant get relay started without those changes.