LPS-35935

Hi Sam,

I rebased and tested https://github.com/brianchandotcom/liferay-portal/pull/12857 I hope Brian accepts it this time.

Thanks.