LPS-34804 avoid using deprecated method