BOS1405148 fix after removing sub donor groups