LPS-36066

We LPS-35937 - LPS-35671 for this ticket to work.
https://github.com/ipeychev/liferay-portal/pull/220