master-bc-1664

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