LPS-44246 and LPS-44090

sending this again after having a conversation with hugo and mhan