Merge pull request #9124 from tvalentyn/cp_9113

[BEAM-7800] Cherry-pick PR 9113 to release branch