master-bc-967

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