master-bc-959

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