master-bc-987

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