LPS-35230

https://github.com/brianchandotcom/liferay-portal/pull/11375