master-bc-1891

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