master-bc-1764

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