APLANATS-916
(cherry picked from commit 6655b6c)