master-bc-2481

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