master-bc-897

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