master-bc-1065

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