master-bc-2365

https://issues.liferay.com/browse/LIFERAYQA-10360

Note: This will not cherry-pick into ee-6.1.30, so pull directly from my branch for ee-6.1.30.