Switched back to RFI b/c it's atomic
Merge branch 'rfi-fix' into development