master-bc-1748

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