LPS-38483 re-applying Jorge's pull