master-bc-2845

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