Lps 45839

Please merge this after https://github.com/brianchandotcom/liferay-portal/pull/17869