Merge branch 'ndt' of code.ornl.gov:exadigit/raps into ndt