master-bc-898

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