- Fixed BR/R
- Preparations for domain mode enablement