Resolve "Reduce server wait times for BV"

Merged Dominik Hebeler requested to merge 1225-reduce-server-wait-times-for-bv into development

Merge request reports