master-bc-1056

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