master-bc-1670

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