master-bc-1071

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