master-bc-1651

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