LPS-40818 New fix for LPS-40165