PR #21614 made this upgrade, but it was accidentally undone by a later PR that merged an out-of-date 'make upgrade'. EDUCATOR-4635
PR #21614 made this upgrade, but it was accidentally undone by a later PR that merged an out-of-date 'make upgrade'. EDUCATOR-4635