BPM BAW performance tuning

Tuning versions v19.0.0.x v20.0.0.x