LPS-32848

https://github.com/matethurzo/liferay-portal/pull/343 needs to be committed first.