LPS-33503 SF
LPS-33093 Just a partial backport