master-bc-918

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