master-bc-1117

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