master-bc-1077

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