master-bc-1074

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