master-bc-1686

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