Merge "Introduce new flag for new BAL modes" into main