master-bc-1138

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