master-bc-1008

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