Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov> (cherry picked from commit edaf08bf6d6ed24573187376921fe67a449851b2)