master-bc-958

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