nl-fix01
be-fix02
nl-fix02
be-fix03
be-fix04
be-fix05
Revert "be-fix05"

This reverts commit bb71a93df93263f2823b24541ddd2fce745ceb11.
be-fix05 (reverted from commit bb71a93df93263f2823b24541ddd2fce745ceb11)