LPS-45839 Compat. Marcellus, please test