master
Merge remote-tracking branch 'upstream/master' into feature/BAEL-7062-GetIndex
[JAVA-29409] (#15483)
[JAVA-34509] Clean up (#16642)