master-bc-1142

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