LPS-36674

For 6.2.x and ee-6.2.x

This dpends on LPS-40144 and LPS-40512, https://github.com/brianchandotcom/liferay-portal/pull/13844.