master-bc-1758

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