OC-8840
(cherry picked from commit 0fdf921)