master-bc-1525

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