master-bc-1226

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