LPS-46243

This is a mix between improving LPS-30036 and maybe fixing a "regression" in behavior that was caused by LPS-30036. Either way it addresses an issue that a customer is seeing which i thought should be fixed.