master-bc-1095

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