master-bc-1235

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