LPS-35342

This is 6.2.x part of the LPS.

The fix for 6.1.x is here: https://github.com/hhuijser/liferay-portal-ee/pull/531