APLANATS-790
(cherry picked from commit 2760628)