master-bc-1102

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