master-bc-1790

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