LPS-31058 Partial merge from https://github.com/brianchandotcom/liferay-portal/pull/15841
LPS-31058 Regenerate