Fix RFRunner
Fix/merge