Potential fix for BAU-483
Merge remote-tracking branch 'origin/dev-BAU-483' into release/2.9.21rc
Bringing in BAU-483, prepping next release vehicle