EA-46969
(cherry picked from commit 6c74dbc)