Revert eval in DB fix, changing back to 5.38 CV outside referencing behaviour

Revert eval in DB fix, changing back to 5.38 CV outside referencing behaviour #14495