master-bc-930

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