Backport of SI-7915

(cherry picked from commit 3009a525b58a4c7865ff524899b85518884ee5f7)