master-bc-1613

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