LPS-31876 This is the corresponding core change to the plugins pr I sent