LPS-47286 (Please backport) Update deprecate method