master-bc-1675

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