master-bc-857

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