master-bc-859

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