master-bc-2556

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