master-bc-890

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