nexus 2.5.0-04

Closes #20421.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>