master-bc-1073

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