master-bc-2671

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