LPS-41713 Apply same changes as LPS-37791