LPS-51458 Across platform support
LPS-51458 Update tests
LPS-51458 SF
LPS-51438 wrong method