APLANATS-929
(cherry-picked from 8396ac6)