master-bc-956

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