master-bc-1000

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