master-bc-2578

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