master-bc-2633

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