master-bc-971

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