Merge "Fix another NPE in RATR.run()" into main