master-bc-1111


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