EAGLESIX-2651: Nary: fixes for require ordering