master-bc-829

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