master-bc-951

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