master-bc-870


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