master-bc-1311

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