master-bc-927

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