master-bc-1343

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