master-bc-1760

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