master-bc-1011

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