master-bc-2683

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