master-bc-1134

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