master-bc-1006


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