ANG-7045 RC

Contains fixes for:
- BHV-3469
- BHV-3926