Added (basic) rain block/delay support.
Merge remote-tracking branch 'upstream/refactor' into refactor