master-bc-944

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