master-bc-1033

https://issues.liferay.com/browse/LIFERAYQA-6633

This is a resending of the rolled back commit from:
https://github.com/brianchandotcom/liferay-portal/pull/16477