master-bc-2664

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