master-bc-2650

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