master-bc-1131

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