Merge common fixes.
Merge commit '9e943d095f7cf404217cf90f9f5367716dd8849a'
Simpler reactor.block