master-bc-2870

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