master-bc-866

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