master-bc-1059

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