Patch for issue #1477: BRBC/BRBS address calculation error.