master-bc-1114

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