master-bc-1105

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