master-bc-2886


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