master-bc-969

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