LPS-25725
LPS-33853 Use latest API
LPS-33954 Typo