master-bc-1066

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