master-bc-2887

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