master-bc-2179


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