master-bc-1730

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