ION-2055 changes
(cherry-picked from ae70b9d)