master-bc-972

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