Merge pull request #15035 from apilloud/blockers

[BEAM-12507][BEAM-12508][release-2.31.0] Fix release content blockers