master-bc-937


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