LPS-38244

ee-6.2.x: https://github.com/brianchandotcom/liferay-plugins-ee/pull/2346
ee-6.1.x: on the way