master-bc-1629

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