LPS-45080 SF
LPS-33427 Revert - will work in a different solution since this causes regressions