LPS-45607 SDK
LPS-47581 Fix NPE in tests