LPS-44852

For master only. Does not work in ee-6.2.x.

This pull request also depends on https://github.com/brianchandotcom/liferay-portal/pull/17167