master-bc-2040

https://issues.liferay.com/browse/LIFERAYQA-10043