Simplified reactor loop code
Merge branch 'reactor-fix' into develop