LPS-33427 Feature completed
Merge branch 'LPS-33427' of github.com:jmnavarro/liferay-portal into LPS-33427