master-bc-1081

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