master-bc-940

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