ref
This is the first step of implementing the guidance in #6342. --------- Co-authored-by: josh11b <15258583+josh11b@users.noreply.github.com>