More robust rf.forEach processing.
Merge commit 'db4d5b88d8b38a557d6f09842f432c418af6016e'