master-bc-2166


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