master-bc-861

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