std/nre
Similar to changes in bafb4f119c (cherry picked from commit 3aaaed1acf)
bafb4f119c
3aaaed1acf