BHV-3607 (RC)

Merge BHV-3607 branch into 2.3.0-release-candidates