master-bc-1658

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