LPS-51583

Hey Hugo

Re-send this branch as Brian's comment : https://github.com/brianchandotcom/liferay-portal/pull/22300.

Thanks
John,