LPD-31546 POC Analize and propose performance improvements to LPD-1681 fix

[liferay-continuous-integration]

Forwarded from: https://github.com/liferay-echo/liferay-portal/pull/15974 (Took 1 ci:forward attempt in 39 seconds) Console

@lfbesada @liferay-echo

Original pull request comment: https://liferay.atlassian.net/browse/LPD-31546

This PR adds some commits of LPD-31041 because is using an util added there.