master-bc-928

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